Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 11 Mar 2010 10:05:39 +0000 (11:05 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 11 Mar 2010 10:05:39 +0000 (11:05 +0100)
commit5e79a54b3227b1bb81d367bd6a4e80d296c61eaa
tree838fc51a5ed677b9e105301036db0c6823ff6532
parent7725fb4acc29c1807b987b8d68f774f2433bfa02
parented61493fdb7b1e723058d1618d7486622d02faa9
Merge from trunk